Merge tag 'upstream/0.7.0' into debian/sid
authorLuca Bruno <lucab@debian.org>
Sun, 14 Feb 2016 14:56:35 +0000 (15:56 +0100)
committerLuca Bruno <lucab@debian.org>
Sun, 14 Feb 2016 14:56:35 +0000 (15:56 +0100)
Upstream version 0.7.0


Trivial merge